Revision: tla--devo--1.1--patch-171
Archive: lord@emf.net--2003b
Creator: Tom Lord <lord@emf.net>
Date: Sat Sep 20 10:31:47 PDT 2003
Standard-date: 2003-09-20 17:31:47 GMT
Modified-files: ChangeLog PLUGIN/options
    libarch/apply-changeset.c libarch/apply-changeset.h
    libarch/build-revision.c libarch/cmd-deltapatch.c
    libarch/cmd-do-changeset.c libarch/cmd-redo-changes.c
    libarch/cmd-star-merge.c libarch/commit.c
    libarch/library-txn.c libarch/replay.c
    libarch/star-merge.c libarch/star-merge.h libarch/undo.c
New-patches: lord@emf.net--2003b/tla--devo--1.1--patch-171
Summary: 3-way merge with conflict markers (in star-merge)

3-way merge with conflict markers (in star-merge)

